merge trunk
authorKenichi Handa <handa@m17n.org>
Fri, 15 Apr 2011 05:30:52 +0000 (14:30 +0900)
committerKenichi Handa <handa@m17n.org>
Fri, 15 Apr 2011 05:30:52 +0000 (14:30 +0900)
commita8ebe7dd43cd84ce17aa762c82bdd91aeb76e095
tree6d1cd79483e2d36042bb1803e1778df27a5d25f3
parent9cce76c5bb5e902d84949b6ed327eccf89b817b3
parent5527e11907b1a43f934bcd6d746e4b567a749d77
merge trunk